Merge changes from emacs-24; up to r108039
authorChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:13:40 +0000 (13:13 +0800)
committerChong Yidong <cyd@gnu.org>
Sun, 17 Jun 2012 05:13:40 +0000 (13:13 +0800)
commitd2800b965a2ae1a7bb03551fb3cbbbeda1c3c3b1
treeb86e4dc549acf76c2b12824e25331b9c03eeb927
parent444d6d8bd10c8598dbb77d4ca74053fcdba90706
parentd5e1bdbe9fb22d11ad65b8b8bb5a5ff250f0733e
Merge changes from emacs-24; up to r108039
40 files changed:
doc/emacs/ChangeLog
doc/emacs/anti.texi
doc/emacs/building.texi
doc/emacs/calendar.texi
doc/emacs/cmdargs.texi
doc/emacs/custom.texi
doc/emacs/display.texi
doc/emacs/emacs.texi
doc/emacs/files.texi
doc/emacs/frames.texi
doc/emacs/glossary.texi
doc/emacs/maintaining.texi
doc/emacs/misc.texi
doc/emacs/msdog.texi
doc/emacs/mule.texi
doc/emacs/programs.texi
doc/emacs/text.texi
doc/lispref/ChangeLog
doc/lispref/customize.texi
doc/lispref/display.texi
doc/lispref/edebug.texi
doc/lispref/elisp.texi
doc/lispref/files.texi
doc/lispref/functions.texi
doc/lispref/keymaps.texi
doc/lispref/loading.texi
doc/lispref/macros.texi
doc/lispref/modes.texi
doc/lispref/nonascii.texi
doc/lispref/os.texi
doc/lispref/positions.texi
doc/lispref/processes.texi
doc/lispref/text.texi
doc/lispref/windows.texi
etc/NEWS
lisp/ChangeLog
lisp/gnus/ChangeLog
lisp/international/mule-cmds.el
src/ChangeLog
src/nsterm.m